Remove conflict indicators

diff --git a/ChangeLog b/ChangeLog
index 805e2ce10e84ab43c208583b8f4c40596fccfb07..8adaf74b75c03eef9cdf23dd1f27ea0bcf922653 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
 
->>>>>>> 1.5032
 Thu Feb 26 15:43:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 805e2ce10e84ab43c208583b8f4c40596fccfb07..8adaf74b75c03eef9cdf23dd1f27ea0bcf922653 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
 
->>>>>>> 1.5032
 Thu Feb 26 15:43:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 805e2ce10e84ab43c208583b8f4c40596fccfb07..8adaf74b75c03eef9cdf23dd1f27ea0bcf922653 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
 
->>>>>>> 1.5032
 Thu Feb 26 15:43:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 805e2ce10e84ab43c208583b8f4c40596fccfb07..8adaf74b75c03eef9cdf23dd1f27ea0bcf922653 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
 
->>>>>>> 1.5032
 Thu Feb 26 15:43:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 805e2ce10e84ab43c208583b8f4c40596fccfb07..8adaf74b75c03eef9cdf23dd1f27ea0bcf922653 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
 
->>>>>>> 1.5032
 Thu Feb 26 15:43:43 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality